Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7993890 authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Thomas Gleixner
Browse files

x86/amd_nb: Make amd_northbridges internal to amd_nb.c 



Hide amd_northbridges in amd_nb.c so that external callers will have to
use the exported accessor functions.

Also, fix some checkpatch.pl warnings.

Signed-off-by: default avatarYazen Ghannam <Yazen.Ghannam@amd.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/1478812257-5424-2-git-send-email-Yazen.Ghannam@amd.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 18807ddb

arch/x86/include/asm/amd_nb.h

+3 −15
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ struct amd_northbridge_info { 
	u64 flags;

	struct amd_northbridge *nb;

};

extern struct amd_northbridge_info amd_northbridges;



#define AMD_NB_GART			BIT(0)

#define AMD_NB_L3_INDEX_DISABLE		BIT(1)
@@ -74,20 +73,9 @@ extern struct amd_northbridge_info amd_northbridges; 


#ifdef CONFIG_AMD_NB



static inline u16 amd_nb_num(void)

{

	return amd_northbridges.num;

}



static inline bool amd_nb_has_feature(unsigned feature)

{

	return ((amd_northbridges.flags & feature) == feature);

}



static inline struct amd_northbridge *node_to_amd_nb(int node)

{

	return (node < amd_northbridges.num) ? &amd_northbridges.nb[node] : NULL;

}

u16 amd_nb_num(void);

bool amd_nb_has_feature(unsigned int feature);

struct amd_northbridge *node_to_amd_nb(int node);



static inline u16 amd_pci_dev_to_node_id(struct pci_dev *pdev)

{

arch/x86/kernel/amd_nb.c

+25 −8
Original line number Diff line number Diff line
@@ -44,8 +44,25 @@ const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[] __initconst = { 
	{ }

};



struct amd_northbridge_info amd_northbridges;

EXPORT_SYMBOL(amd_northbridges);

static struct amd_northbridge_info amd_northbridges;



u16 amd_nb_num(void)

{

	return amd_northbridges.num;

}

EXPORT_SYMBOL(amd_nb_num);



bool amd_nb_has_feature(unsigned int feature)

{

	return ((amd_northbridges.flags & feature) == feature);

}

EXPORT_SYMBOL(amd_nb_has_feature);



struct amd_northbridge *node_to_amd_nb(int node)

{

	return (node < amd_northbridges.num) ? &amd_northbridges.nb[node] : NULL;

}

EXPORT_SYMBOL(node_to_amd_nb);



static struct pci_dev *next_northbridge(struct pci_dev *dev,

					const struct pci_device_id *ids)
@@ -64,7 +81,7 @@ int amd_cache_northbridges(void) 
	struct amd_northbridge *nb;

	struct pci_dev *misc, *link;



	if (amd_nb_num())

	if (amd_northbridges.num)

		return 0;



	misc = NULL;
@@ -82,7 +99,7 @@ int amd_cache_northbridges(void) 
	amd_northbridges.num = i;



	link = misc = NULL;

	for (i = 0; i != amd_nb_num(); i++) {

	for (i = 0; i != amd_northbridges.num; i++) {

		node_to_amd_nb(i)->misc = misc =

			next_northbridge(misc, amd_nb_misc_ids);

		node_to_amd_nb(i)->link = link =
@@ -226,14 +243,14 @@ static void amd_cache_gart(void) 
	if (!amd_nb_has_feature(AMD_NB_GART))

		return;



	flush_words = kmalloc(amd_nb_num() * sizeof(u32), GFP_KERNEL);

	flush_words = kmalloc_array(amd_northbridges.num, sizeof(u32), GFP_KERNEL);

	if (!flush_words) {

		amd_northbridges.flags &= ~AMD_NB_GART;

		pr_notice("Cannot initialize GART flush words, GART support disabled\n");

		return;

	}



	for (i = 0; i != amd_nb_num(); i++)

	for (i = 0; i != amd_northbridges.num; i++)

		pci_read_config_dword(node_to_amd_nb(i)->misc, 0x9c, &flush_words[i]);

}
@@ -252,12 +269,12 @@ void amd_flush_garts(void) 
	   that it doesn't matter to serialize more. -AK */

	spin_lock_irqsave(&gart_lock, flags);

	flushed = 0;

	for (i = 0; i < amd_nb_num(); i++) {

	for (i = 0; i < amd_northbridges.num; i++) {

		pci_write_config_dword(node_to_amd_nb(i)->misc, 0x9c,

				       flush_words[i] | 1);

		flushed++;

	}

	for (i = 0; i < amd_nb_num(); i++) {

	for (i = 0; i < amd_northbridges.num; i++) {

		u32 w;

		/* Make sure the hardware actually executed the flush*/

		for (;;) {